Merged.

diff --cc tools/examples/vif-nat
Simple merge

diff --cc tools/examples/xmexample.vmx
index 6144be86d4363d255dcf2d9c77741eb4b0db0a82,9030b06117f344bc0c6037db14ef849ded94ccf6..4ebc4ff59dd904b120cf785b4414902c467f28a9
--- 1/tools/examples/xmexample.vmx
--- 2/tools/examples/xmexample.vmx
+++ b/tools/examples/xmexample.vmx
@@@ -37,13 -37,9 +37,11 @@@ vcpus=
  
  # Optionally define mac and/or bridge for the network interfaces.
  # Random MACs are assigned if not given.
- # nics default is 1
- #vif = [ 'type=ioemu, mac=aa:00:00:00:00:11, bridge=xenbr0' ]
- nics=1 
+ #vif = [ 'type=ioemu, mac=00:16:3e:00:00:11, bridge=xenbr0' ]
  # type=ioemu specify the NIC is an ioemu device not netfront
  vif = [ 'type=ioemu, bridge=xenbr0' ]
 +# for multiple NICs in device model, 3 in this example
 +#vif = [ 'type=ioemu, bridge=xenbr0', 'type=ioemu', 'type=ioemu']
  
  #----------------------------------------------------------------------------
  # Define the disk devices you want the domain to have access to, and

diff --cc tools/python/xen/xm/create.py
Simple merge